@@ -5,14 +5,12 @@ import {ENV} from "../utils/env.js";
55import { validatePwd } from "../utils/api_validate.js" ;
66import { startJsonWatcher , getApiEngine } from "../utils/api_helper.js" ;
77import * as drpyS from '../libs/drpyS.js' ;
8- import drpy2 from '../libs/drpy2.js' ;
98import hipy from '../libs/hipy.js' ;
109import xbpq from '../libs/xbpq.js' ;
1110import catvod from '../libs/catvod.js' ;
1211
1312const ENGINES = {
1413 drpyS,
15- drpy2,
1614 hipy,
1715 xbpq,
1816 catvod,
@@ -70,6 +68,7 @@ export default (fastify, options, done) => {
7068 // console.log('moduleExt:', typeof moduleExt, moduleExt);
7169 const protocol = request . headers [ 'x-forwarded-proto' ] || ( request . socket . encrypted ? 'https' : 'http' ) ;
7270 const hostname = request . hostname ;
71+ const requestHost = `${ protocol } ://${ hostname } ` ;
7372 const publicUrl = `${ protocol } ://${ hostname } /public/` ;
7473 const jsonUrl = `${ protocol } ://${ hostname } /json/` ;
7574 const httpUrl = `${ protocol } ://${ hostname } /http` ;
@@ -84,6 +83,7 @@ export default (fastify, options, done) => {
8483 return proxyUrl
8584 } ;
8685 return {
86+ requestHost,
8787 proxyUrl,
8888 publicUrl,
8989 jsonUrl,
@@ -289,12 +289,13 @@ export default (fastify, options, done) => {
289289 const moduleExt = query . extend || '' ;
290290 const protocol = request . headers [ 'x-forwarded-proto' ] || ( request . socket . encrypted ? 'https' : 'http' ) ;
291291 const hostname = request . hostname ;
292-
292+ const requestHost = ` ${ protocol } :// ${ hostname } ` ;
293293 const publicUrl = `${ protocol } ://${ hostname } /public/` ;
294294 const jsonUrl = `${ protocol } ://${ hostname } /json/` ;
295295 const httpUrl = `${ protocol } ://${ hostname } /http` ;
296296 const mediaProxyUrl = `${ protocol } ://${ hostname } /mediaProxy` ;
297297 const hostUrl = `${ hostname . split ( ':' ) [ 0 ] } ` ;
298+
298299 const fServer = fastify . server ;
299300
300301 function getEnv ( moduleName ) {
@@ -303,6 +304,7 @@ export default (fastify, options, done) => {
303304 return proxyUrl
304305 } ;
305306 return {
307+ requestHost,
306308 proxyUrl,
307309 proxyPath,
308310 publicUrl,
@@ -398,7 +400,7 @@ export default (fastify, options, done) => {
398400 const moduleExt = query . extend || '' ;
399401 const protocol = request . headers [ 'x-forwarded-proto' ] || ( request . socket . encrypted ? 'https' : 'http' ) ;
400402 const hostname = request . hostname ;
401-
403+ const requestHost = ` ${ protocol } :// ${ hostname } ` ;
402404 const publicUrl = `${ protocol } ://${ hostname } /public/` ;
403405 const jsonUrl = `${ protocol } ://${ hostname } /json/` ;
404406 const httpUrl = `${ protocol } ://${ hostname } /http` ;
@@ -412,6 +414,7 @@ export default (fastify, options, done) => {
412414 return proxyUrl
413415 } ;
414416 return {
417+ requestHost,
415418 proxyUrl,
416419 publicUrl,
417420 jsonUrl,
0 commit comments