Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
asaccool committed Jul 22, 2019
1 parent de676e7 commit 04d7586
Show file tree
Hide file tree
Showing 21 changed files with 3,871 additions and 384 deletions.
2 changes: 1 addition & 1 deletion conf/currentVersion
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"cset": {
"global.DomainReference/aliases": "{\"local\":\"jjcOyi7aRZLvXOuIt1ou5JowDYbIgeN6yYeiOChObw\"}",
"global.DomainReference/jjcOyi7aRZLvXOuIt1ou5JowDYbIgeN6yYeiOChObw": "{\"meta\":{\"swarmTypeName\":\"global.DomainReference\",\"swarmId\":\"jjcOyi7aRZLvXOuIt1ou5JowDYbIgeN6yYeiOChObw\",\"homeSecurityContext\":\"system\",\"command\":\"stored\"},\"publicVars\":{\"role\":\"system\",\"alias\":\"local\",\"addresses\":{},\"constitution\":\"../bundles/domain.js\",\"workspace\":\"../conf\",\"remoteInterfaces\":{\"system\":\"http://127.0.0.1:8080\"},\"localInterfaces\":{\"local\":\"../tmp/localqueue/system\"}},\"privateVars\":{}}"
"global.DomainReference/jjcOyi7aRZLvXOuIt1ou5JowDYbIgeN6yYeiOChObw": "{\"meta\":{\"swarmTypeName\":\"global.DomainReference\",\"swarmId\":\"jjcOyi7aRZLvXOuIt1ou5JowDYbIgeN6yYeiOChObw\",\"homeSecurityContext\":\"system\",\"command\":\"stored\"},\"publicVars\":{\"role\":\"system\",\"alias\":\"local\",\"addresses\":{},\"constitution\":\"../../domains/exampleDomain/bundles/domain.js\",\"workspace\":\"../conf\",\"remoteInterfaces\":{\"system\":\"http://127.0.0.1:8080\"},\"localInterfaces\":{\"local\":\"../tmp/localqueue/system\"}},\"privateVars\":{}}"
},
"writeSetVersions": {
"global.DomainReference/aliases": null,
Expand Down
3 changes: 0 additions & 3 deletions domain/build.json

This file was deleted.

3 changes: 3 additions & 0 deletions domains/exampleDomain/build.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"domain": {"deps":"example", "autoLoad":true}
}
22 changes: 22 additions & 0 deletions domains/exampleDomain/bundles/domain.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions domains/exampleDomain/libraries/example/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
$$.swarm.describe("Echo", {
say: function(message){
this.return(null, "Echo:"+message);
}
});
File renamed without changes.
File renamed without changes.
19 changes: 16 additions & 3 deletions psknode/bin/scripts/pskbuild.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
var fs = require("fs");
var path = require("path");
var browserify = require('browserify');
var fsExt = require("../../../libraries/utils/FSExtension").fsExt;

var args = process.argv.slice(2);
var externalTarget = process.argv[3];
Expand Down Expand Up @@ -116,7 +115,13 @@ function doBrowserify(targetName, src, dest, opt, externalModules, exportsModule
});
}
//ensure dir struct exists
fsExt.createDir(path.dirname(dest));
try{
fs.mkdirSync(path.dirname(dest), {recursive:true});
}catch(err){
if(err.code !== "EEXIST"){
console.log(err);
}
}

var out = fs.createWriteStream(dest);
package.bundle().pipe(out);
Expand Down Expand Up @@ -153,7 +158,15 @@ function buildDependencyMap(targetName, configProperty, output) {
};`;

//ensure dir struct exists
fsExt.createDir(path.dirname(output));
try{
fs.mkdirSync(path.dirname(output), {recursive:true});
}catch(err){
if(err.code !== "EEXIST"){
console.log(err);
}
}


fs.writeFileSync(output, result);
}

Expand Down
2 changes: 2 additions & 0 deletions psknode/bin/scripts/virtualMq.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ const config = {

require('../../bundles/pskruntime.js');
require('../../bundles/virtualMQ.js');
require('../../bundles/psknode');
require('../../bundles/consoleTools');

const VirtualMQ = require('virtualmq').VirtualMQ;
const fs = require('fs');
Expand Down
103 changes: 77 additions & 26 deletions psknode/bundles/consoleTools.js

Large diffs are not rendered by default.

86 changes: 68 additions & 18 deletions psknode/bundles/httpinteract.js

Large diffs are not rendered by default.

67 changes: 49 additions & 18 deletions psknode/bundles/pskclient.js

Large diffs are not rendered by default.

Loading

0 comments on commit 04d7586

Please sign in to comment.