修复bug。

Author: DSFdsfWxp

ext/built-in/textweb/src/index.js

@@ -474,11 +474,6 @@ export class application extends extType.application.base {
             } catch (e) {
                 console.log('[picProcessServer] picProcessServerError', e);
                 try {
-<<<<<<< HEAD
-=======
-                    res.writeHead(200, 'OK', { 'content-type': 'image/png', 'content-length': `${picLoadFailTip.length}` });
-                    res.write(picLoadFailTip);
->>>>>>> 5220509 (init.)
                     res.end();
                 } catch (ee) { }
             }

ext/built-in/textweb/src/libPic.js

@@ -9,13 +9,8 @@ import * as fs from "node:fs";
 async function ffmpegDecodeToPng(data,extname){
     return new Promise((resolve,reject)=>{
         var fn = sharedLib.random.randomUUID();
-<<<<<<< HEAD
         fs.writeFileSync(`/ydpsys/tmp/${fn}.${extname}`,data);
         var ffmpeg = childProcess.spawn('chroot',['.','ffmpeg','-i',`/tmp/${fn}.${extname}`,`/tmp/${fn}.png`],{cwd:'/ydpsys'});
-=======
-        fs.writeFileSync(`${process.env['ydpSysRootPath']}/tmp/${fn}.${extname}`,data);
-        var ffmpeg = childProcess.spawn('chroot',['.','ffmpeg','-i',`/tmp/${fn}.${extname}`,`/tmp/${fn}.png`],{cwd:`${process.env['ydpSysRootPath']}`});
->>>>>>> 5220509 (init.)
         var outTxt = '';
         ffmpeg.stdout.on('data',(d)=>{
             outTxt += String(d);
@@ -29,23 +24,13 @@ async function ffmpegDecodeToPng(data,extname){
             }else{
                 console.log('[libPic] ffmpeg exit with code',code,'. ');
             }
-<<<<<<< HEAD
             if (!fs.existsSync(`/ydpsys/tmp/${fn}.png`)){
                 reject(outTxt);
                 return;
             }
             var res = fs.readFileSync(`/ydpsys/tmp/${fn}.png`);
             fs.unlinkSync(`/ydpsys/tmp/${fn}.png`);
             fs.unlinkSync(`/ydpsys/tmp/${fn}.${extname}`);
-=======
-            if (!fs.existsSync(`${process.env['ydpSysRootPath']}/tmp/${fn}.png`)){
-                reject(outTxt);
-                return;
-            }
-            var res = fs.readFileSync(`${process.env['ydpSysRootPath']}/tmp/${fn}.png`);
-            fs.unlinkSync(`${process.env['ydpSysRootPath']}/tmp/${fn}.png`);
-            fs.unlinkSync(`${process.env['ydpSysRootPath']}/tmp/${fn}.${extname}`);
->>>>>>> 5220509 (init.)
             resolve(res);
         });
     });
@@ -154,10 +139,6 @@ export async function processPic(path) {
             data = await ffmpegDecodeToPng(data,'pic');
             img = await imageJs.Image.load(data);
         }catch(ee){
-<<<<<<< HEAD
-=======
-            console.log('[libPic] try ffmpeg failed. \n',ee);
->>>>>>> 5220509 (init.)
             return {
                 type: 'text/plain',
                 buff:Buffer.from(`${url}\n${JSON.stringify(opt)}\n${ee}`)
@@ -191,11 +172,7 @@ export async function processPic(path) {
         type: 'image/png'
     };
 }
-<<<<<<< HEAD
 export async function process(Url, nowUrl, processServerHost, opt,svgOpt) {
-=======
-export async function processLagacy(Url, nowUrl, processServerHost, opt,svgOpt) {
->>>>>>> 5220509 (init.)
     return new Promise((resolve, reject) => {
         try {
             /*

ext/built-in/textweb/src/sharedLib.js

@@ -214,11 +214,7 @@ export async function lagacyProcess(input, processServerHost) {
                         break;
                     }
                     case 'pic': {
-<<<<<<< HEAD
                         let o = await pic.process(c.data, input.url, processServerHost, input.opt,input.svgOpt);
-=======
-                        let o = await pic.processLagacy(c.data, input.url, processServerHost, input.opt,input.svgOpt);
->>>>>>> 5220509 (init.)
                         if (!pics.includes(o[0].data)) pics.push(o[0].data);
                         out = out.concat(o);
                         break;

ext/example/async/index.js

@@ -63,22 +63,11 @@ export async function input(session,msg,update,done,isAlive,hold){
 }
 
 export async function switchIn(session,cb){
-<<<<<<< HEAD
     return new Promise(async (resolve,reject)=>{
         await fadeIn(`this input event used \`Promise\`.`,fadeTime,update,0,2048,[]);
         setTimeout(async ()=>{
             await fadeOut(`this input event used \`Promise\`.`,fadeTime,update,0,2048,[]);
             await fadeIn(helpInfo,fadeTime,update,0,2048,recommendRes);
-=======
-    const f = (txt,nowNum,maxNum,suggestedResponse)=>{
-        cb(txt,suggestedResponse,nowNum,maxNum);
-    };
-    return new Promise(async (resolve,reject)=>{
-        await fadeIn(`this input event used \`Promise\`.`,fadeTime,f,0,2048,[]);
-        setTimeout(async ()=>{
-            await fadeOut(`this input event used \`Promise\`.`,fadeTime,f,0,2048,[]);
-            await fadeIn(helpInfo,fadeTime,f,0,2048,recommendRes);
->>>>>>> 5220509 (init.)
             resolve();
         },3000);
     });