@wener/utils 1.1.14 → 1.1.16

package/src/servers/createFetchWithProxyByNodeFetch.ts

@@ -1,10 +1,11 @@
 import { type FetchLike } from '../fetch';
-import { globalThis } from '../isomorphics/globalThis';
+import { getGlobalThis } from '../isomorphics/getGlobalThis';
 
 export function createFetchWithProxyByNodeFetch({
   proxy,
   fetch,
 }: { proxy?: string; fetch?: FetchLike } = {}): FetchLike {
+  const globalThis = getGlobalThis();
   if (!proxy) {
     return fetch || globalThis.fetch;
   }
@@ -16,7 +17,7 @@ export function createFetchWithProxyByNodeFetch({
   return async (url, init?: RequestInit) => {
     if (!agent) {
       const { default: createHttpsProxyAgent } = await import('https-proxy-agent');
-      agent = createHttpsProxyAgent(proxy);
+      agent = (createHttpsProxyAgent as any)(proxy);
     }
 
     // node-fetch 才可以，node v18 fetch 不支持

package/src/servers/createFetchWithProxyByUndici.ts

@@ -1,12 +1,14 @@
-import { MaybePromise } from 'rollup';
+import { MaybePromise } from '../asyncs/MaybePromise';
 import { FetchLike } from '../fetch';
 
 export function createFetchWithProxyByUndici({
   proxy,
+  token: _token,
   fetch,
   undici,
 }: {
   proxy?: string;
+  token?: string;
   fetch?: FetchLike;
   undici?: MaybePromise<{ fetch: any; ProxyAgent: any }>;
 } = {}): FetchLike {
@@ -14,19 +16,44 @@ export function createFetchWithProxyByUndici({
     return fetch || globalThis.fetch;
   }
   let agent: any;
+  // https://github.com/nodejs/undici/blob/main/docs/best-practices/proxy.md
   return async (...args) => {
-    const init: RequestInit & { duplex?: string; dispatcher?: any } = (args[1] ||= {});
-    if (init.body instanceof ReadableStream) {
-      // https://github.com/nodejs/node/issues/46221
-      init.duplex ||= 'half';
+    const init = (args[1] ||= {}) as RequestInit & {
+      duplex?: string;
+      dispatcher?: any;
+    };
+    {
+      const body = init.body;
+      if (typeof body === 'object' && body && (body instanceof ReadableStream || Symbol.asyncIterator in body)) {
+        // request.duplex must be set if request.body is ReadableStream or Async Iterables
+        init.duplex ||= 'half';
+      }
     }
     if (!agent) {
+      let uri = proxy;
+      let token = _token;
+      {
+        let u: URL | undefined;
+        try {
+          u = new URL(proxy);
+        } catch (e) {}
+        if (!token && u && (u.username || u.password)) {
+          token = `Basic ${btoa(`${u.username || ''}:${u.password}`)}`;
+          u.username = '';
+          u.password = '';
+          uri = u.toString();
+        }
+      }
       // if in next use 'next/dist/compiled/undici'
       undici ||= import('undici');
       const mod = await undici;
-      const ProxyAgent = mod.ProxyAgent;
-      fetch ||= mod.fetch;
-      agent = new ProxyAgent(proxy);
+      const ProxyAgent = mod.ProxyAgent as new (_: any) => any;
+      fetch ||= mod.fetch as FetchLike;
+      // https://github.com/nodejs/undici/blob/main/docs/api/ProxyAgent.md
+      agent = new ProxyAgent({
+        uri,
+        token,
+      });
       // https://github.com/nodejs/node/issues/43187#issuecomment-1134634174
       // (global as any)[Symbol.for('undici.globalDispatcher.1')] = agent;
     }

package/src/servers/polyfillCrypto.ts

@@ -1,6 +1,7 @@
-import { globalThis } from '../isomorphics/globalThis';
+import { getGlobalThis } from '../isomorphics/getGlobalThis';
 
 export async function polyfillCrypto() {
+  const globalThis = getGlobalThis();
   if ('crypto' in globalThis) {
     return false;
   }

package/src/servers/polyfillJsDom.ts

@@ -1,11 +1,13 @@
 import type { ConstructorOptions, ResourceLoaderConstructorOptions } from 'jsdom';
-import { globalThis } from '../isomorphics/globalThis';
+import { getGlobalThis } from '../isomorphics/getGlobalThis';
 
 export async function polyfillJsDom() {
   if (typeof window !== 'undefined') {
     return false;
   }
 
+  const globalThis = getGlobalThis();
+
   const { ResourceLoader, JSDOM } = await import('jsdom');
 
   // https://github.com/lukechilds/window/blob/master/src/index.js

package/src/servers/polyfillWebSocket.ts

@@ -1,9 +1,10 @@
 import type { MaybePromise } from '../asyncs/MaybePromise';
-import { globalThis } from '../isomorphics/globalThis';
+import { getGlobalThis } from '../isomorphics/getGlobalThis';
 
 export function polyfillWebSocket(ws: any): boolean;
 export function polyfillWebSocket(ws?: undefined): Promise<boolean>;
 export function polyfillWebSocket(ws?: any): MaybePromise<boolean> {
+  const globalThis = getGlobalThis();
   if ('WebSocket' in globalThis) {
     return false;
   }

package/dist/cjs/globalThis-ee7c1669.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"globalThis-ee7c1669.js","sources":["../../src/isomorphics/getGlobalThis.ts","../../src/isomorphics/globalThis.ts"],"sourcesContent":["declare const global: typeof globalThis;\n\n/**\n * isomorphic globalThis\n *\n * globalThis supported by ff 65, Chrome 71, Node 12, babel\n *\n * non-standard globalThis supported for Alipay Miniprogram\n *\n * @see https://caniuse.com/#search=globalThis\n * @see https://v8.dev/features/globalthis\n */\nexport const getGlobalThis = (): typeof globalThis => {\n  if (typeof globalThis !== 'undefined') return globalThis;\n  if (typeof self !== 'undefined') return self;\n  if (typeof window !== 'undefined') return window;\n  if (typeof global !== 'undefined') return global as any;\n  if (typeof this !== 'undefined') return this as any;\n  throw new Error('Unable to locate global `this`');\n};\n","import { getGlobalThis } from './getGlobalThis';\n\nexport const globalThis = getGlobalThis();\n"],"names":["getGlobalThis","globalThis"],"mappings":"AAYO,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAMA,EAAgB,CAAyB,CAAA,CAAA,CAAA,CACpD,GAAI,CAAO,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAe,IAAa,CAAO,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAC9C,CAAI,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAO,KAAS,CAAa,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAO,KACxC,CAAI,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAO,OAAW,CAAa,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAO,CAC1C,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAI,OAAO,CAAW,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAa,OAAO,CAE1C,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAM,IAAI,CAAM,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAgC,CAClD,CAAA,CCjBaC,EAAaD,CAAc,CAAA,CAAA;"}

package/dist/esm/globalThis-000611c3.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"globalThis-000611c3.js","sources":["../../src/isomorphics/getGlobalThis.ts","../../src/isomorphics/globalThis.ts"],"sourcesContent":["declare const global: typeof globalThis;\n\n/**\n * isomorphic globalThis\n *\n * globalThis supported by ff 65, Chrome 71, Node 12, babel\n *\n * non-standard globalThis supported for Alipay Miniprogram\n *\n * @see https://caniuse.com/#search=globalThis\n * @see https://v8.dev/features/globalthis\n */\nexport const getGlobalThis = (): typeof globalThis => {\n  if (typeof globalThis !== 'undefined') return globalThis;\n  if (typeof self !== 'undefined') return self;\n  if (typeof window !== 'undefined') return window;\n  if (typeof global !== 'undefined') return global as any;\n  if (typeof this !== 'undefined') return this as any;\n  throw new Error('Unable to locate global `this`');\n};\n","import { getGlobalThis } from './getGlobalThis';\n\nexport const globalThis = getGlobalThis();\n"],"names":["getGlobalThis","globalThis"],"mappings":"AAYO,CAAA,CAAA,CAAA,CAAA,CAAA,CAAMA,CAAgB,CAAA,CAAA,CAAA,CAAA,CAAyB,CACpD,CAAA,CAAA,CAAI,OAAO,CAAe,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAa,CAAO,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAC9C,GAAI,CAAO,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAS,CAAa,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAO,KACxC,CAAI,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAO,CAAW,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAa,CAAO,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAC1C,CAAI,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAO,OAAW,CAAa,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAO,CAE1C,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAM,IAAI,CAAM,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAgC,CAClD,CAAA,CCjBaC,EAAaD,CAAc,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA;"}

package/dist/system/globalThis-7bba6592.js

@@ -1,2 +0,0 @@
-System.register([],function(t){"use strict";return{execute:function(){const e=t("a",()=>{if(typeof globalThis<"u")return globalThis;if(typeof self<"u")return self;if(typeof window<"u")return window;if(typeof global<"u")return global;throw new Error("Unable to locate global `this`")}),o=t("g",e())}}});
-//# sourceMappingURL=globalThis-7bba6592.js.map

package/dist/system/globalThis-7bba6592.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"globalThis-7bba6592.js","sources":["../../src/isomorphics/getGlobalThis.ts","../../src/isomorphics/globalThis.ts"],"sourcesContent":["declare const global: typeof globalThis;\n\n/**\n * isomorphic globalThis\n *\n * globalThis supported by ff 65, Chrome 71, Node 12, babel\n *\n * non-standard globalThis supported for Alipay Miniprogram\n *\n * @see https://caniuse.com/#search=globalThis\n * @see https://v8.dev/features/globalthis\n */\nexport const getGlobalThis = (): typeof globalThis => {\n  if (typeof globalThis !== 'undefined') return globalThis;\n  if (typeof self !== 'undefined') return self;\n  if (typeof window !== 'undefined') return window;\n  if (typeof global !== 'undefined') return global as any;\n  if (typeof this !== 'undefined') return this as any;\n  throw new Error('Unable to locate global `this`');\n};\n","import { getGlobalThis } from './getGlobalThis';\n\nexport const globalThis = getGlobalThis();\n"],"names":["getGlobalThis","globalThis"],"mappings":"sEAYa,CAAA,CAAA,CAAA,CAAA,CAAA,CAAAA,QAAgB,CAAyB,CAAA,CAAA,CAAA,CACpD,CAAI,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAO,CAAe,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAa,CAAO,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAC9C,CAAI,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAO,CAAS,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAa,OAAO,CACxC,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAI,CAAO,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAW,CAAa,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAO,CAC1C,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAI,CAAO,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAW,CAAa,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAO,CAE1C,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAM,CAAI,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAM,CAAgC,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAAA,CAClD,CAAA,CAAA,CCjBaC,KAAaD,CAAAA,CAAAA,CAAAA,CAAAA,CAAc,CAAA;"}

package/lib/isomorphics/globalThis.js

@@ -1,6 +0,0 @@
-import { getGlobalThis } from './getGlobalThis.js';
-
-const globalThis = getGlobalThis();
-
-export { globalThis };
-//# sourceMappingURL=globalThis.js.map

package/lib/isomorphics/globalThis.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"globalThis.js","sources":["../../src/isomorphics/globalThis.ts"],"sourcesContent":["import { getGlobalThis } from './getGlobalThis';\n\nexport const globalThis = getGlobalThis();\n"],"names":[],"mappings":";;AAEO,MAAM,aAAa,aAAc;;;;"}

package/lib/servers/createFetchWithProxyByNodeFetch.js

@@ -1,37 +0,0 @@
-import { globalThis } from '../isomorphics/globalThis.js';
-
-function createFetchWithProxyByNodeFetch({
-  proxy,
-  fetch
-} = {}) {
-  if (!proxy) {
-    return fetch || globalThis.fetch;
-  }
-  let agent;
-  const Request = globalThis.Request;
-  let NodeRequest;
-  let NodeFetch;
-  return async (url, init) => {
-    if (!agent) {
-      const { default: createHttpsProxyAgent } = await import('https-proxy-agent');
-      agent = createHttpsProxyAgent(proxy);
-    }
-    if (!NodeRequest) {
-      ({ Request: NodeRequest, default: NodeFetch } = await import('node-fetch'));
-    }
-    fetch || (fetch = NodeFetch);
-    if (url instanceof Request) {
-      return fetch(new Request(url, { agent }));
-    }
-    if (url instanceof NodeRequest) {
-      return fetch(new NodeRequest(url, { agent }));
-    }
-    return fetch(url, {
-      ...init,
-      agent
-    });
-  };
-}
-
-export { createFetchWithProxyByNodeFetch };
-//# sourceMappingURL=createFetchWithProxyByNodeFetch.js.map

package/lib/servers/createFetchWithProxyByNodeFetch.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"createFetchWithProxyByNodeFetch.js","sources":["../../src/servers/createFetchWithProxyByNodeFetch.ts"],"sourcesContent":["import { type FetchLike } from '../fetch';\nimport { globalThis } from '../isomorphics/globalThis';\n\nexport function createFetchWithProxyByNodeFetch({\n  proxy,\n  fetch,\n}: { proxy?: string; fetch?: FetchLike } = {}): FetchLike {\n  if (!proxy) {\n    return fetch || globalThis.fetch;\n  }\n\n  let agent: any;\n  const Request = globalThis.Request;\n  let NodeRequest: any;\n  let NodeFetch: any;\n  return async (url, init?: RequestInit) => {\n    if (!agent) {\n      const { default: createHttpsProxyAgent } = await import('https-proxy-agent');\n      agent = createHttpsProxyAgent(proxy);\n    }\n\n    // node-fetch 才可以，node v18 fetch 不支持\n    if (!NodeRequest) {\n      ({ Request: NodeRequest, default: NodeFetch } = await import('node-fetch'));\n    }\n\n    fetch ||= NodeFetch;\n\n    if (url instanceof Request) {\n      return (fetch as any)(new Request(url, { agent } as any));\n    }\n    if ((url as any) instanceof NodeRequest) {\n      return (fetch as any)(new NodeRequest(url, { agent } as any));\n    }\n    return (fetch as any)(url, {\n      ...init,\n      agent,\n    } as any);\n  };\n}\n"],"names":[],"mappings":";;AAGO,SAAS,+BAAgC,CAAA;AAAA,EAC9C,KAAA;AAAA,EACA,KAAA;AACF,CAAA,GAA2C,EAAe,EAAA;AACxD,EAAA,IAAI,CAAC,KAAO,EAAA;AACV,IAAA,OAAO,SAAS,UAAW,CAAA,KAAA,CAAA;AAAA,GAC7B;AAEA,EAAI,IAAA,KAAA,CAAA;AACJ,EAAA,MAAM,UAAU,UAAW,CAAA,OAAA,CAAA;AAC3B,EAAI,IAAA,WAAA,CAAA;AACJ,EAAI,IAAA,SAAA,CAAA;AACJ,EAAO,OAAA,OAAO,KAAK,IAAuB,KAAA;AACxC,IAAA,IAAI,CAAC,KAAO,EAAA;AACV,MAAA,MAAM,EAAE,OAAS,EAAA,qBAAA,EAA0B,GAAA,MAAM,OAAO,mBAAmB,CAAA,CAAA;AAC3E,MAAA,KAAA,GAAQ,sBAAsB,KAAK,CAAA,CAAA;AAAA,KACrC;AAGA,IAAA,IAAI,CAAC,WAAa,EAAA;AAChB,MAAC,CAAA,EAAE,SAAS,WAAa,EAAA,OAAA,EAAS,WAAc,GAAA,MAAM,OAAO,YAAY,CAAA,EAAA;AAAA,KAC3E;AAEA,IAAU,KAAA,KAAA,KAAA,GAAA,SAAA,CAAA,CAAA;AAEV,IAAA,IAAI,eAAe,OAAS,EAAA;AAC1B,MAAA,OAAQ,MAAc,IAAI,OAAA,CAAQ,KAAK,EAAE,KAAA,EAAc,CAAC,CAAA,CAAA;AAAA,KAC1D;AACA,IAAA,IAAK,eAAuB,WAAa,EAAA;AACvC,MAAA,OAAQ,MAAc,IAAI,WAAA,CAAY,KAAK,EAAE,KAAA,EAAc,CAAC,CAAA,CAAA;AAAA,KAC9D;AACA,IAAA,OAAQ,MAAc,GAAK,EAAA;AAAA,MACzB,GAAG,IAAA;AAAA,MACH,KAAA;AAAA,KACM,CAAA,CAAA;AAAA,GACV,CAAA;AACF;;;;"}

package/src/isomorphics/globalThis.ts

@@ -1,3 +0,0 @@
-import { getGlobalThis } from './getGlobalThis';
-
-export const globalThis = getGlobalThis();

package/src/servers/createFetchWithLogger.ts

@@ -1,75 +0,0 @@
-import { FetchLike } from '../fetch';
-
-export function createFetchWithLogger({
-  fetch = globalThis.fetch,
-  logger = console.log,
-}: {
-  fetch?: FetchLike;
-  logger?: (s: string) => void;
-} = {}): FetchLike {
-  return async (...args) => {
-    const [, init = { method: 'GET', headers: {} } as RequestInit] = args;
-    const url = typeof args[0] === 'string' ? args[0] : args[0].url;
-
-    let dumpRequest = `-> ${init.method} ${url}
-${Array.from(new Headers(init.headers).entries())
-  .map(([k, v]) => `${k}: ${v}`)
-  .join('\n')}
-`;
-
-    if (init.body) {
-      if (init.body instanceof ReadableStream) {
-        const [a, b] = init.body.tee();
-        init.body = a;
-        const signal = init.signal;
-        Promise.resolve().then(async () => {
-          const reader = b.getReader();
-          logger(dumpRequest);
-          while (true) {
-            if (signal?.aborted) {
-              break;
-            }
-
-            let { done, value } = await reader.read();
-            value instanceof Uint8Array && (value = new TextDecoder().decode(value));
-            dumpRequest += value;
-            logger(value);
-            if (!done) {
-              break;
-            }
-          }
-          // maybe for archive
-          dumpRequest += `\n`;
-        });
-      } else {
-        dumpRequest += `
-${init.body}
-`;
-      }
-    }
-    console.log(dumpRequest);
-
-    try {
-      let res = await fetch(...args);
-      let dumpResponse = `<- ${res.status} ${res.statusText} ${init.method} ${url}
-  ${Array.from(res.headers.entries())
-    .map(([k, v]) => `${k}: ${v}`)
-    .join('\n')}
-   `;
-      let contentType = res.headers.get('content-type');
-      // text/event-stream
-      if (contentType?.includes('application/json') || contentType?.includes('text/plain')) {
-        const body = await res.text();
-        dumpResponse += `\n${body}\n`;
-        res = new Response(body, res);
-      }
-
-      logger(dumpResponse);
-
-      return res;
-    } catch (e) {
-      console.error(`[Error] -> ${init.method} ${url} :${e}`);
-      throw e;
-    }
-  };
-}