efront 4.34.1 → 4.35.0

package/coms/frame/chat-rtc.xht

@@ -132,18 +132,6 @@
     </span>
 </div>
 <script>
-    var chatrtc = new ChatRTC;
-    // fullscreen.open();
-    var status = function () {
-        return acceptTime ? i18n`通话中` : rejectTime ? i18n`无应答` : i18n`正在呼叫`
-    };
-    var btn = button;
-    var dvs;
-    var callingStart = new Date, acceptTime = 0;
-    var started = false;
-    var interval = 0;
-    var timeNode = document.createTextNode("");
-    var rejectTime = 0;
     care(this, function ([type, sender, data]) {
         if (sender !== remoteUser.cid) return;
         switch (type) {
@@ -161,6 +149,23 @@
                 break;
         }
     });
+    var page = this;
+    var onCandidate = function (candidate) {
+        cast(page, ["didate", candidate]);
+    };
+    var chatrtc = new ChatRTC(onCandidate);
+    // fullscreen.open();
+    var status = function () {
+        return acceptTime ? i18n`通话中` : rejectTime ? i18n`无应答` : i18n`正在呼叫`
+    };
+    var btn = button;
+    var dvs;
+    var callingStart = new Date, acceptTime = 0;
+    var started = false;
+    var interval = 0;
+    var timeNode = document.createTextNode("");
+    var rejectTime = 0;
+
     interval = setInterval(function () {
         var toNum2 = a => a < 10 ? "0" + a : a;
         var now = new Date;
@@ -231,17 +236,15 @@
         await start();
         acceptTime = new Date;
     };
-    var onCandidate = function (candidate) {
-        cast(page, ["didate", candidate]);
-    };
+
     var start = async function () {
         try {
             if (!remoteOffer) {
-                var offer = await chatrtc.call(onCandidate, remoteOffer);
+                var offer = await chatrtc.initOffer();
                 cast(page, ['offer', offer]);
             }
             else {
-                var answer = await chatrtc.call(onCandidate, remoteOffer);
+                var answer = await chatrtc.takeOffer(remoteOffer);
                 cast(page, ['accept', answer]);
             }
         }
@@ -253,7 +256,6 @@
         }
         render.refresh();
     }
-    var page = this;
     var hangup = async function () {
         cast(page, ['hangup']);
         remove(page);

package/coms/frame/chat.js

@@ -111,17 +111,30 @@ var dragpage = {
 }
 
 var rtcMap = Object.create(null);
-var getRtc = function (userid) {
+var getRtc = function (userid, scope, offer) {
     var rtc = rtcMap[userid];
-    if (!rtc) rtc = rtcMap[userid] = new ChatRTC;
+    if (!rtc) {
+        rtc = rtcMap[userid] = new ChatRTC(function (date) {
+            scope.send("didate", date, userid);
+
+        });
+        if (offer) rtc.takeOffer(offer).then(answer => {
+            scope.send('takeup', answer, userid);
+        });
+    }
     return rtc;
 }
+var channelId = 0;
 async function pullFileWithRTC(scope, file) {
     var rid = scope.remoteUser.cid;
-    var rtc = getRtc(rid);
+    var rtc = getRtc(rid, scope);
+    var pullid = Math.random().toString(36).slice(2, 6) + "-" + ++channelId;
     var h = await window.showSaveFilePicker({ suggestedName: file.name });
     var writable = await h.createWritable();
-    var channel = await rtc.createChannel();
+    /**
+     * @type {RTCDataChannel}
+     */
+    var channel = await rtc.createChannel(pullid);
     channel.binaryType = 'arraybuffer';
     var writed = 0;
     var span = document.createElement('div');
@@ -159,40 +172,34 @@ async function pullFileWithRTC(scope, file) {
     channel.onerror = function (event) {
         // <!-- console.log('接收端异常',event) -->
     };
-    var ondate = function (date) {
-        scope.send("didate", date, rid);
-    };
-    var offer = await rtc.init(ondate);
-    scope.send('accept', { file: file.id, channel: channel.id, offer })
+    var offer = await rtc.initOffer();
+    scope.send('accept', { file: file.id, channel: pullid, offer })
     channel.onmessage = async function (event) {
         var buff = new Uint8Array(event.data);
         writed += buff.length;
         // <!-- console.log('接收端收到', writed, file.size); -->
         await writable.write(buff);
         report();
-        if (writed >= file.size) {
-            writable.close();
-        }
     }
+
 }
 /**
  * @param {File} file
  */
 async function pushFileWithRTC(scope, file, msg) {
     var sender = msg.sender;
-    var rtc = getRtc(sender);
+    var rtc = getRtc(sender, scope, msg.offer);
     var reader = file.stream().getReader();
-    var ondate = function (date) {
-        scope.send("didate", date, sender);
-    }
-    var answer = await rtc.init(ondate, msg.offer);
-    scope.send('takeup', answer, sender);
-    var remote = await rtc.waitChannel();
+    /**
+     * @type {RTCDataChannel}
+     */
+    var remote = await rtc.waitChannel(msg.channel);
     remote.binaryType = 'arraybuffer';
     var writed = 0, reported = 0;
     var readed = reader.read();
     var sizeLimit = 65536;
     remote.onmessage = async function (event) {
+        if (!opened) opened = true;
         var [low, high] = new Uint32Array(event.data);
         reported = high * 0x100000000 + low;
         // <!-- console.log('发送端收到', size(writed), size(reported)); -->
@@ -200,8 +207,8 @@ async function pushFileWithRTC(scope, file, msg) {
         var readed1 = readed;
         readed = reader.read();
         var { done, value } = await readed1;
-        if (done) {
-            if (writed < file.size) console.error('发送未完成', size(file.size), size(writed), value);
+        if (done || writed >= file.size) {
+            if (writed !== file.size) console.error('发送异常', size(file.size), size(writed), value);
             remote.close();
             return;
         }
@@ -217,9 +224,18 @@ async function pushFileWithRTC(scope, file, msg) {
     remote.onerror = function (event) {
         // <!-- console.log("发送端异常",event) -->
     }
+    var opened = false;
     remote.onopen = async function () {
         // <!-- console.log("发送端打开") -->
+        opened = true;
     };
+    if (remote.readyState === 'open') {
+        await wait(20);
+        if (!opened) {
+            opened = true;
+            remote.send(new Uint8Array(0));
+        }
+    }
 }
 var shakeing = [];
 var shakeUser = async function (page, shakes) {
@@ -475,6 +491,7 @@ function chat(title = '会话窗口') {
         },
         async qr(canvas) {
             var qrcode = await init("thirdParty$qrcode");
+            if (!this.cid) await wait(() => this.cid, 12000);
             var qr = qrcode(0, 'L');
             var href = this.linkurl;
             qr.addData(href);

package/coms/frame/chat.less

@@ -157,16 +157,21 @@ padding {
     }
 }
 
+padding{
+    padding: 0 20px;
+}
 msg {
+    max-width: 100%;
     display: block;
     border-radius: 4px;
     padding: 6px 12px;
     line-height: 20px;
     white-space: normal;
     word-break: break-all;
-    background: #fff;
+    @color-remote:lch(60 30 90);
+    background: @color-remote;
     position: relative;
-    margin: 0 10px;
+    margin: 0 -10px;
     float: left;
     user-select: text;
 
@@ -181,7 +186,7 @@ msg {
 
     &:not([self]):before {
         left: 0;
-        border-right-color: #fff;
+        border-right-color: @color-remote;
     }
 
     &[self] {

package/coms/reptile/colors.js

@@ -49,6 +49,7 @@ colors.outside = colors.FgCyan;
 colors.stamp = colors.FgGray;
 colors.regexp = colors.FgRed2;
 colors.text = colors.FgRed;
+colors.danger = colors.Underscore + colors.BgRed + colors.FgWhite2;
 colors.flow = colors.FgPurple;
 colors.digit = colors.FgGreen2;
 colors.deep0 = colors.FgYellow;

package/coms/zimoli/prompt.js

@@ -30,7 +30,7 @@ var fixContainer = function (elem, ipt) {
     move.fixPosition(elem);
 };
 function prompt() {
-    var msg, check, ipt;
+    var msg, check, ipt, info;
     var opts = [];
     var submit = null;
     var wrap = false;
@@ -53,6 +53,7 @@ function prompt() {
             if (isFunction(arg.check)) check = arg.check;
             if (isFunction(arg.submit)) submit = arg;
             if (isString(arg.msg || arg.title)) msg = arg.msg || arg.title;
+            if (isHandled(arg.info)) info = arg.info;
             if (isHandled(arg.value)) value = arg.value;
             for (var k in attrs) {
                 if (k in arg) attrs[k] = arg[k];
@@ -94,7 +95,16 @@ function prompt() {
         on('input')(ipt, setDisable);
     }
     var body = document.createElement("div");
-    appendChild(body, [ipt, tip]);
+    var content = [ipt, tip];
+    if (info) {
+        if (isNode(info)) content.push(info);
+        else {
+            var info_node = document.createElement('div');
+            info_node.innerHTML = info;
+            content.push(info_node);
+        }
+    }
+    appendChild(body, content);
     var c = confirm(msg, body, buttons, async function (_) {
         if (_ === buttons[0]) {
             var value = getValue();

package/coms/zimoli/render.js

@@ -722,7 +722,6 @@ class Model {
             return;
         }
         this.ss.call(this.target, value);
-        console.log(value, this.value, this.gs.call(this.target))
         this.value = value;
         this.bd.value = this.gs.call(this.target, value);
         if (isFunction(this.emit?.call)) {

package/coms//350/214/250/350/217/260//344/270/212/350/211/262.xht

@@ -90,6 +90,10 @@
         color: #4fc1ff;
     }
 
+    danger {
+        color: #da0c2e;
+    }
+
     comment {
         color: #6a9955;
     }

package/coms//350/214/250/350/217/260//346/240/207/347/255/276/345/214/226.js

@@ -13,14 +13,22 @@ var amp = a => `&#${a.charCodeAt()};`;
 var encodeAmp = function (a) {
     return a.replace(/[\<\>\|&]/g, amp);
 };
-var codecolor = function (c, encode) {
-    var wrap = arguments[2];
-    if (encode?.length === 2) wrap = encode, encode = arguments[2];
+var codecolor = function (c) {
+    var envs, wrap, encode;
+    for (var cx = 1, dx = arguments.length; cx < dx; cx++) {
+        var a = arguments[cx];
+        switch (typeof a) {
+            case "object": envs = a; break;
+            case "function":
+                if (!wrap && a.length === 2) wrap = a;
+                else encode = a;
+                break;
+        }
+    }
     if (!wrap) {
         wrap = wrapLabel;
         if (!encode) encode = encodeAmp;
     }
-    var envs = c.envs;
     var deep = 0;
     var used = c.used;
     var scoped = c.scoped;
@@ -69,6 +77,7 @@ var codecolor = function (c, encode) {
         if (pdot) keys.shift();
         var invoked = null;
         var endi = keys.length - 1;
+        if (o.danger) var danger = wrap(keys[0], 'danger');
         if (isInvoke(o)) {
             if (!/^[\?]/.test(keys[endi])) invoked = wrap(keys[endi], "invoke");
         }
@@ -84,6 +93,7 @@ var codecolor = function (c, encode) {
             keys[cx] = /^[\?]/.test(k) || !k ? k : wrap(k, 'express');
         }
         if (endi === keys.length - 1) keys[endi] = invoked;
+        if (danger) keys[0] = danger;
         keys = keys.join(".");
         if (pdot) keys = "." + keys;
         o.text = keys;

package/package.json

@@ -1,24 +1,24 @@
-{
-    "name": "efront",
-    "version": "4.34.1",
-    "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
-    "main": "public/efront.js",
-    "directories": {
-        "test": "test"
-    },
-    "bin": {
-        "efront": "public/efront.js"
-    },
-    "scripts": {
-        "prepack": "node tools/build-efront.js --node --no-target&node public/efront build 文件系统.html"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/yunxu1019/efront.git"
-    },
-    "keywords": [
-        "efront"
-    ],
-    "author": "yunxu1019",
-    "license": "MIT"
-}
+{
+  "name": "efront",
+  "version": "4.35.0",
+  "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
+  "main": "./coms/efront",
+  "directories": {
+    "test": "test"
+  },
+  "bin": {
+    "efront": "tools/run-efront.bat"
+  },
+  "scripts": {
+    "prepack": "node tools/build-efront.js --node --no-target&node public/efront build 文件系统.html"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/yunxu1019/efront.git"
+  },
+  "keywords": [
+    "efront"
+  ],
+  "author": "yunxu1019",
+  "license": "MIT"
+}