@breakside/jskit 2022.4.0 → 2022.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Frameworks/DOM.jsframework/Info.json +2 -2
- package/Frameworks/DOM.jsframework/io.breakside.JSKit.DOM-bundle.js +2 -2
- package/Frameworks/FontKit.jsframework/Info.json +2 -2
- package/Frameworks/FontKit.jsframework/io.breakside.JSKit.FontKit-bundle.js +2 -2
- package/Frameworks/Foundation.jsframework/Info.json +2 -2
- package/Frameworks/Foundation.jsframework/io.breakside.JSKit.Foundation-bundle.js +2 -2
- package/Frameworks/SecurityKit.jsframework/Info.json +2 -2
- package/Frameworks/SecurityKit.jsframework/io.breakside.JSKit.SecurityKit-bundle.js +2 -2
- package/Info.json +2 -2
- package/Node/io.breakside.jskit-bundle.js +2 -2
- package/Root/Frameworks/APIKit/Info.yaml +1 -1
- package/Root/Frameworks/APIKitTesting/Info.yaml +1 -1
- package/Root/Frameworks/AuthKit/Info.yaml +1 -1
- package/Root/Frameworks/CSSOM/Info.yaml +1 -1
- package/Root/Frameworks/ChartKit/Info.yaml +1 -1
- package/Root/Frameworks/ConferenceKit/Info.yaml +1 -1
- package/Root/Frameworks/DBKit/DBMongoStore.js +1 -0
- package/Root/Frameworks/DBKit/DBRedisStore.js +136 -117
- package/Root/Frameworks/DBKit/Info.yaml +1 -1
- package/Root/Frameworks/DOM/Info.yaml +1 -1
- package/Root/Frameworks/Dispatch/Info.yaml +1 -1
- package/Root/Frameworks/FontKit/Info.yaml +1 -1
- package/Root/Frameworks/Foundation/Info.yaml +1 -1
- package/Root/Frameworks/ImageKit/Info.yaml +1 -1
- package/Root/Frameworks/MediaKit/Info.yaml +1 -1
- package/Root/Frameworks/MediaKitUI/Info.yaml +1 -1
- package/Root/Frameworks/NotificationKit/Info.yaml +1 -1
- package/Root/Frameworks/PDFKit/Info.yaml +1 -1
- package/Root/Frameworks/QRKit/Info.yaml +1 -1
- package/Root/Frameworks/SearchKit/Info.yaml +1 -1
- package/Root/Frameworks/SecurityKit/Info.yaml +1 -1
- package/Root/Frameworks/ServerKit/Info.yaml +1 -1
- package/Root/Frameworks/ServerKit/SKJobQueue.js +1 -1
- package/Root/Frameworks/ServerKit/SKRedisJobQueue.js +7 -3
- package/Root/Frameworks/ServerKitTesting/Info.yaml +1 -1
- package/Root/Frameworks/TestKit/Info.yaml +1 -1
- package/Root/Frameworks/UIKit/Info.yaml +1 -1
- package/Root/Frameworks/UIKitTesting/Info.yaml +1 -1
- package/Root/Templates/http/${PROJECT_NAME}/Dockerfile +1 -1
- package/Root/Templates/node/${PROJECT_NAME}/Dockerfile +4 -2
- package/package.json +1 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"JSBundleType": "framework",
|
|
3
3
|
"JSBundleIdentifier": "io.breakside.JSKit.DOM",
|
|
4
|
-
"JSBundleVersion": "2022.
|
|
4
|
+
"JSBundleVersion": "2022.6.0",
|
|
5
5
|
"JSDevelopmentLanguage": "en",
|
|
6
6
|
"JSCopyright": "Copyright © 2020 Breakside Inc.",
|
|
7
7
|
"JSBundleEnvironments": {
|
|
@@ -9,5 +9,5 @@
|
|
|
9
9
|
"node": "DOM+Node.js"
|
|
10
10
|
},
|
|
11
11
|
"JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
|
|
12
|
-
"GitRevision": "
|
|
12
|
+
"GitRevision": "de032a1e1f2485f8f63b4989d038b7bcaf240314"
|
|
13
13
|
}
|
|
@@ -3,7 +3,7 @@ JSBundle.bundles['io.breakside.JSKit.DOM'] = {
|
|
|
3
3
|
"Info": {
|
|
4
4
|
"JSBundleType": "framework",
|
|
5
5
|
"JSBundleIdentifier": "io.breakside.JSKit.DOM",
|
|
6
|
-
"JSBundleVersion": "2022.
|
|
6
|
+
"JSBundleVersion": "2022.6.0",
|
|
7
7
|
"JSDevelopmentLanguage": "en",
|
|
8
8
|
"JSCopyright": "Copyright © 2020 Breakside Inc.",
|
|
9
9
|
"JSBundleEnvironments": {
|
|
@@ -11,7 +11,7 @@ JSBundle.bundles['io.breakside.JSKit.DOM'] = {
|
|
|
11
11
|
"node": "DOM+Node.js"
|
|
12
12
|
},
|
|
13
13
|
"JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
|
|
14
|
-
"GitRevision": "
|
|
14
|
+
"GitRevision": "de032a1e1f2485f8f63b4989d038b7bcaf240314"
|
|
15
15
|
},
|
|
16
16
|
"Resources": [],
|
|
17
17
|
"ResourceLookup": {
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"JSBundleType": "framework",
|
|
3
3
|
"JSBundleIdentifier": "io.breakside.JSKit.FontKit",
|
|
4
|
-
"JSBundleVersion": "2022.
|
|
4
|
+
"JSBundleVersion": "2022.6.0",
|
|
5
5
|
"JSDevelopmentLanguage": "en",
|
|
6
6
|
"JSCopyright": "Copyright © 2020 Breakside Inc.",
|
|
7
7
|
"JSBundleEnvironments": {
|
|
8
8
|
"html": "FontKit+HTML.js"
|
|
9
9
|
},
|
|
10
10
|
"JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
|
|
11
|
-
"GitRevision": "
|
|
11
|
+
"GitRevision": "de032a1e1f2485f8f63b4989d038b7bcaf240314"
|
|
12
12
|
}
|
|
@@ -3,14 +3,14 @@ JSBundle.bundles['io.breakside.JSKit.FontKit'] = {
|
|
|
3
3
|
"Info": {
|
|
4
4
|
"JSBundleType": "framework",
|
|
5
5
|
"JSBundleIdentifier": "io.breakside.JSKit.FontKit",
|
|
6
|
-
"JSBundleVersion": "2022.
|
|
6
|
+
"JSBundleVersion": "2022.6.0",
|
|
7
7
|
"JSDevelopmentLanguage": "en",
|
|
8
8
|
"JSCopyright": "Copyright © 2020 Breakside Inc.",
|
|
9
9
|
"JSBundleEnvironments": {
|
|
10
10
|
"html": "FontKit+HTML.js"
|
|
11
11
|
},
|
|
12
12
|
"JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
|
|
13
|
-
"GitRevision": "
|
|
13
|
+
"GitRevision": "de032a1e1f2485f8f63b4989d038b7bcaf240314"
|
|
14
14
|
},
|
|
15
15
|
"Resources": [],
|
|
16
16
|
"ResourceLookup": {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"JSBundleType": "framework",
|
|
3
3
|
"JSBundleIdentifier": "io.breakside.JSKit.Foundation",
|
|
4
|
-
"JSBundleVersion": "2022.
|
|
4
|
+
"JSBundleVersion": "2022.6.0",
|
|
5
5
|
"JSDevelopmentLanguage": "en",
|
|
6
6
|
"JSCopyright": "Copyright © 2020 Breakside Inc.",
|
|
7
7
|
"JSBundleEnvironments": {
|
|
@@ -9,5 +9,5 @@
|
|
|
9
9
|
"node": "Foundation+Node.js"
|
|
10
10
|
},
|
|
11
11
|
"JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
|
|
12
|
-
"GitRevision": "
|
|
12
|
+
"GitRevision": "de032a1e1f2485f8f63b4989d038b7bcaf240314"
|
|
13
13
|
}
|
|
@@ -3,7 +3,7 @@ JSBundle.bundles['io.breakside.JSKit.Foundation'] = {
|
|
|
3
3
|
"Info": {
|
|
4
4
|
"JSBundleType": "framework",
|
|
5
5
|
"JSBundleIdentifier": "io.breakside.JSKit.Foundation",
|
|
6
|
-
"JSBundleVersion": "2022.
|
|
6
|
+
"JSBundleVersion": "2022.6.0",
|
|
7
7
|
"JSDevelopmentLanguage": "en",
|
|
8
8
|
"JSCopyright": "Copyright © 2020 Breakside Inc.",
|
|
9
9
|
"JSBundleEnvironments": {
|
|
@@ -11,7 +11,7 @@ JSBundle.bundles['io.breakside.JSKit.Foundation'] = {
|
|
|
11
11
|
"node": "Foundation+Node.js"
|
|
12
12
|
},
|
|
13
13
|
"JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
|
|
14
|
-
"GitRevision": "
|
|
14
|
+
"GitRevision": "de032a1e1f2485f8f63b4989d038b7bcaf240314"
|
|
15
15
|
},
|
|
16
16
|
"Resources": [
|
|
17
17
|
{
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"JSBundleType": "framework",
|
|
3
3
|
"JSBundleIdentifier": "io.breakside.JSKit.SecurityKit",
|
|
4
|
-
"JSBundleVersion": "2022.
|
|
4
|
+
"JSBundleVersion": "2022.6.0",
|
|
5
5
|
"JSDevelopmentLanguage": "en",
|
|
6
6
|
"JSCopyright": "Copyright © 2020 Breakside Inc.",
|
|
7
7
|
"JSBundleEnvironments": {
|
|
@@ -9,5 +9,5 @@
|
|
|
9
9
|
"node": "SecurityKit+Node.js"
|
|
10
10
|
},
|
|
11
11
|
"JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
|
|
12
|
-
"GitRevision": "
|
|
12
|
+
"GitRevision": "de032a1e1f2485f8f63b4989d038b7bcaf240314"
|
|
13
13
|
}
|
|
@@ -3,7 +3,7 @@ JSBundle.bundles['io.breakside.JSKit.SecurityKit'] = {
|
|
|
3
3
|
"Info": {
|
|
4
4
|
"JSBundleType": "framework",
|
|
5
5
|
"JSBundleIdentifier": "io.breakside.JSKit.SecurityKit",
|
|
6
|
-
"JSBundleVersion": "2022.
|
|
6
|
+
"JSBundleVersion": "2022.6.0",
|
|
7
7
|
"JSDevelopmentLanguage": "en",
|
|
8
8
|
"JSCopyright": "Copyright © 2020 Breakside Inc.",
|
|
9
9
|
"JSBundleEnvironments": {
|
|
@@ -11,7 +11,7 @@ JSBundle.bundles['io.breakside.JSKit.SecurityKit'] = {
|
|
|
11
11
|
"node": "SecurityKit+Node.js"
|
|
12
12
|
},
|
|
13
13
|
"JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
|
|
14
|
-
"GitRevision": "
|
|
14
|
+
"GitRevision": "de032a1e1f2485f8f63b4989d038b7bcaf240314"
|
|
15
15
|
},
|
|
16
16
|
"Resources": [],
|
|
17
17
|
"ResourceLookup": {
|
package/Info.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"JSBundleType": "node",
|
|
3
3
|
"JSBundleIdentifier": "io.breakside.jskit",
|
|
4
|
-
"JSBundleVersion": "2022.
|
|
4
|
+
"JSBundleVersion": "2022.6.0",
|
|
5
5
|
"JSExecutableName": "jskit",
|
|
6
6
|
"NPMOrganization": "breakside",
|
|
7
7
|
"JSResources": [
|
|
8
8
|
"Tests/HTMLTestRunner.js",
|
|
9
9
|
"Tests/NodeTestRunner.js"
|
|
10
10
|
],
|
|
11
|
-
"GitRevision": "
|
|
11
|
+
"GitRevision": "de032a1e1f2485f8f63b4989d038b7bcaf240314"
|
|
12
12
|
}
|
|
@@ -3,14 +3,14 @@ JSBundle.bundles['io.breakside.jskit'] = {
|
|
|
3
3
|
"Info": {
|
|
4
4
|
"JSBundleType": "node",
|
|
5
5
|
"JSBundleIdentifier": "io.breakside.jskit",
|
|
6
|
-
"JSBundleVersion": "2022.
|
|
6
|
+
"JSBundleVersion": "2022.6.0",
|
|
7
7
|
"JSExecutableName": "jskit",
|
|
8
8
|
"NPMOrganization": "breakside",
|
|
9
9
|
"JSResources": [
|
|
10
10
|
"Tests/HTMLTestRunner.js",
|
|
11
11
|
"Tests/NodeTestRunner.js"
|
|
12
12
|
],
|
|
13
|
-
"GitRevision": "
|
|
13
|
+
"GitRevision": "de032a1e1f2485f8f63b4989d038b7bcaf240314"
|
|
14
14
|
},
|
|
15
15
|
"Resources": [
|
|
16
16
|
{
|
|
@@ -40,6 +40,7 @@ JSClass("DBMongoStore", DBObjectStore, {
|
|
|
40
40
|
this.databaseName = url.pathComponents[1];
|
|
41
41
|
url = url.copy();
|
|
42
42
|
url.path = null;
|
|
43
|
+
url.query.set("retryWrites", "false");
|
|
43
44
|
this.tlsCertificateName = url.query.get("ssl_ca_certs", null);
|
|
44
45
|
if (this.tlsCertificateName !== null){
|
|
45
46
|
url.query.unset("ssl_ca_certs");
|
|
@@ -41,7 +41,7 @@ JSClass("DBRedisStore", DBObjectStore, {
|
|
|
41
41
|
|
|
42
42
|
open: function(completion){
|
|
43
43
|
logger.info("Redis client connecting to %{public}:%d...", this.url.host, this.url.port || 6379);
|
|
44
|
-
this.client = this.redis.createClient({url: this.url.encodedString});
|
|
44
|
+
this.client = this.redis.createClient({url: this.url.encodedString, legacyMode: true});
|
|
45
45
|
var store = this;
|
|
46
46
|
var errorHandler = function(error){
|
|
47
47
|
logger.info("Failed to open Redis connection: %{error}", error);
|
|
@@ -67,8 +67,12 @@ JSClass("DBRedisStore", DBObjectStore, {
|
|
|
67
67
|
store.close(fn);
|
|
68
68
|
}
|
|
69
69
|
};
|
|
70
|
-
this.client.
|
|
71
|
-
|
|
70
|
+
if (this.client.connect){
|
|
71
|
+
this.client.connect().then(readyHandler, errorHandler);
|
|
72
|
+
}else{
|
|
73
|
+
this.client.on("error", errorHandler);
|
|
74
|
+
this.client.on("ready", readyHandler);
|
|
75
|
+
}
|
|
72
76
|
},
|
|
73
77
|
|
|
74
78
|
closeCallback: null,
|
|
@@ -233,7 +237,7 @@ JSClass("DBRedisStore", DBObjectStore, {
|
|
|
233
237
|
|
|
234
238
|
watchClientQueue: null,
|
|
235
239
|
|
|
236
|
-
dequeueReusableWatchClient: function(){
|
|
240
|
+
dequeueReusableWatchClient: function(completion, target){
|
|
237
241
|
if (this.watchClientQueue === null){
|
|
238
242
|
this.watchClientQueue = [];
|
|
239
243
|
}
|
|
@@ -245,7 +249,17 @@ JSClass("DBRedisStore", DBObjectStore, {
|
|
|
245
249
|
return this.watchClientQueue.shift();
|
|
246
250
|
}
|
|
247
251
|
logger.info("opening watch client to %{public}:%d", this.url.host, this.url.port || 6379);
|
|
248
|
-
|
|
252
|
+
var client = this.redis.createClient({url: this.url.encodedString, legacyMode: true});
|
|
253
|
+
if (client.connect){
|
|
254
|
+
client.connect().then(function(){
|
|
255
|
+
completion.call(target, client);
|
|
256
|
+
}, function(error){
|
|
257
|
+
logger.error("Error connecting to watch client: %{error}", error);
|
|
258
|
+
completion.call(target, null);
|
|
259
|
+
});
|
|
260
|
+
}else{
|
|
261
|
+
completion.call(target, client);
|
|
262
|
+
}
|
|
249
263
|
},
|
|
250
264
|
|
|
251
265
|
enqueueReusableWatchClient: function(client){
|
|
@@ -277,120 +291,125 @@ JSClass("DBRedisStore", DBObjectStore, {
|
|
|
277
291
|
},
|
|
278
292
|
|
|
279
293
|
exclusiveSave: function(id, change, completion){
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
var waitInterval = JSTimeInterval.milliseconds(20);
|
|
283
|
-
var retires = 0;
|
|
284
|
-
var store = this;
|
|
285
|
-
var trySave = function(){
|
|
286
|
-
try{
|
|
287
|
-
watchClient.watch(id, function(error){
|
|
288
|
-
if (error !== null){
|
|
289
|
-
logger.error("Failure calling redis watch: %{error}", error);
|
|
290
|
-
watchClient.quit();
|
|
291
|
-
completion(false);
|
|
292
|
-
return;
|
|
293
|
-
}
|
|
294
|
-
try{
|
|
295
|
-
watchClient.get(id, function(error, json){
|
|
296
|
-
if (error !== null){
|
|
297
|
-
logger.error("Failure calling redis get: %{error}", error);
|
|
298
|
-
watchClient.quit();
|
|
299
|
-
completion(false);
|
|
300
|
-
return;
|
|
301
|
-
}
|
|
302
|
-
var object = null;
|
|
303
|
-
try{
|
|
304
|
-
object = JSON.parse(json);
|
|
305
|
-
}catch (e){
|
|
306
|
-
logger.error("Failure parsing object json: %{error}", error);
|
|
307
|
-
watchClient.quit();
|
|
308
|
-
completion(false);
|
|
309
|
-
return;
|
|
310
|
-
}
|
|
311
|
-
try{
|
|
312
|
-
watchClient.ttl(id, function(error, ttl){
|
|
313
|
-
if (error !== null){
|
|
314
|
-
logger.error("Failure calling redis ttl: %{error}", error);
|
|
315
|
-
watchClient.quit();
|
|
316
|
-
completion(false);
|
|
317
|
-
return;
|
|
318
|
-
}
|
|
319
|
-
try{
|
|
320
|
-
change(object, function(changedObject){
|
|
321
|
-
if (changedObject === null){
|
|
322
|
-
watchClient.quit();
|
|
323
|
-
completion(false);
|
|
324
|
-
return;
|
|
325
|
-
}
|
|
326
|
-
var changedJSON = null;
|
|
327
|
-
try{
|
|
328
|
-
changedJSON = JSON.stringify(changedObject);
|
|
329
|
-
}catch (e){
|
|
330
|
-
logger.error("Failed to serialize object for redis: %{error}", e);
|
|
331
|
-
watchClient.quit();
|
|
332
|
-
completion(false);
|
|
333
|
-
return;
|
|
334
|
-
}
|
|
335
|
-
var args = [id, changedJSON];
|
|
336
|
-
if (ttl > 0){
|
|
337
|
-
args.push("EX");
|
|
338
|
-
args.push(ttl);
|
|
339
|
-
}
|
|
340
|
-
try{
|
|
341
|
-
watchClient.multi().set(args).exec(function(error, results){
|
|
342
|
-
if (error !== null){
|
|
343
|
-
logger.error("Failure calling redis multi/set/exec: %{error}", error);
|
|
344
|
-
watchClient.quit();
|
|
345
|
-
completion(false);
|
|
346
|
-
return;
|
|
347
|
-
}
|
|
348
|
-
if (results === null){
|
|
349
|
-
// null results means the transaction failed, so it's our signal to retry
|
|
350
|
-
++retires;
|
|
351
|
-
if (retires > maxRetires){
|
|
352
|
-
store.enqueueReusableWatchClient(watchClient);
|
|
353
|
-
completion(true);
|
|
354
|
-
return;
|
|
355
|
-
}
|
|
356
|
-
JSTimer.scheduledTimerWithInterval(waitInterval, trySave);
|
|
357
|
-
waitInterval = Math.min(1, waitInterval * 2);
|
|
358
|
-
return;
|
|
359
|
-
}
|
|
360
|
-
store.enqueueReusableWatchClient(watchClient);
|
|
361
|
-
completion(true);
|
|
362
|
-
});
|
|
363
|
-
}catch (e){
|
|
364
|
-
logger.error("Error thrown calling redis multi/set/exec: %{error}", e);
|
|
365
|
-
watchClient.quit();
|
|
366
|
-
completion(false);
|
|
367
|
-
}
|
|
368
|
-
});
|
|
369
|
-
}catch (e){
|
|
370
|
-
logger.error("Error thrown calling change function: %{error}", e);
|
|
371
|
-
watchClient.quit();
|
|
372
|
-
completion(false);
|
|
373
|
-
}
|
|
374
|
-
});
|
|
375
|
-
}catch (e){
|
|
376
|
-
logger.error("Error thrown calling redis ttl: %{error}", error);
|
|
377
|
-
watchClient.quit();
|
|
378
|
-
completion(false);
|
|
379
|
-
}
|
|
380
|
-
});
|
|
381
|
-
}catch (e){
|
|
382
|
-
logger.error("Error thrown calling redis get: %{error}", error);
|
|
383
|
-
watchClient.quit();
|
|
384
|
-
completion(false);
|
|
385
|
-
}
|
|
386
|
-
});
|
|
387
|
-
}catch (e){
|
|
388
|
-
logger.error("Error thrown calling redis watch: %{error}", e);
|
|
389
|
-
watchClient.quit();
|
|
294
|
+
this.dequeueReusableWatchClient(function(watchClient){
|
|
295
|
+
if (watchClient === null){
|
|
390
296
|
completion(false);
|
|
297
|
+
return;
|
|
391
298
|
}
|
|
392
|
-
|
|
393
|
-
|
|
299
|
+
var maxRetires = 30;
|
|
300
|
+
var waitInterval = JSTimeInterval.milliseconds(20);
|
|
301
|
+
var retires = 0;
|
|
302
|
+
var store = this;
|
|
303
|
+
var trySave = function(){
|
|
304
|
+
try{
|
|
305
|
+
watchClient.watch(id, function(error){
|
|
306
|
+
if (error !== null){
|
|
307
|
+
logger.error("Failure calling redis watch: %{error}", error);
|
|
308
|
+
watchClient.quit();
|
|
309
|
+
completion(false);
|
|
310
|
+
return;
|
|
311
|
+
}
|
|
312
|
+
try{
|
|
313
|
+
watchClient.get(id, function(error, json){
|
|
314
|
+
if (error !== null){
|
|
315
|
+
logger.error("Failure calling redis get: %{error}", error);
|
|
316
|
+
watchClient.quit();
|
|
317
|
+
completion(false);
|
|
318
|
+
return;
|
|
319
|
+
}
|
|
320
|
+
var object = null;
|
|
321
|
+
try{
|
|
322
|
+
object = JSON.parse(json);
|
|
323
|
+
}catch (e){
|
|
324
|
+
logger.error("Failure parsing object json: %{error}", error);
|
|
325
|
+
watchClient.quit();
|
|
326
|
+
completion(false);
|
|
327
|
+
return;
|
|
328
|
+
}
|
|
329
|
+
try{
|
|
330
|
+
watchClient.ttl(id, function(error, ttl){
|
|
331
|
+
if (error !== null){
|
|
332
|
+
logger.error("Failure calling redis ttl: %{error}", error);
|
|
333
|
+
watchClient.quit();
|
|
334
|
+
completion(false);
|
|
335
|
+
return;
|
|
336
|
+
}
|
|
337
|
+
try{
|
|
338
|
+
change(object, function(changedObject){
|
|
339
|
+
if (changedObject === null){
|
|
340
|
+
watchClient.quit();
|
|
341
|
+
completion(false);
|
|
342
|
+
return;
|
|
343
|
+
}
|
|
344
|
+
var changedJSON = null;
|
|
345
|
+
try{
|
|
346
|
+
changedJSON = JSON.stringify(changedObject);
|
|
347
|
+
}catch (e){
|
|
348
|
+
logger.error("Failed to serialize object for redis: %{error}", e);
|
|
349
|
+
watchClient.quit();
|
|
350
|
+
completion(false);
|
|
351
|
+
return;
|
|
352
|
+
}
|
|
353
|
+
var args = [id, changedJSON];
|
|
354
|
+
if (ttl > 0){
|
|
355
|
+
args.push("EX");
|
|
356
|
+
args.push(ttl);
|
|
357
|
+
}
|
|
358
|
+
try{
|
|
359
|
+
watchClient.multi().set(args).exec(function(error, results){
|
|
360
|
+
if (error !== null){
|
|
361
|
+
logger.error("Failure calling redis multi/set/exec: %{error}", error);
|
|
362
|
+
watchClient.quit();
|
|
363
|
+
completion(false);
|
|
364
|
+
return;
|
|
365
|
+
}
|
|
366
|
+
if (results === null){
|
|
367
|
+
// null results means the transaction failed, so it's our signal to retry
|
|
368
|
+
++retires;
|
|
369
|
+
if (retires > maxRetires){
|
|
370
|
+
store.enqueueReusableWatchClient(watchClient);
|
|
371
|
+
completion(true);
|
|
372
|
+
return;
|
|
373
|
+
}
|
|
374
|
+
JSTimer.scheduledTimerWithInterval(waitInterval, trySave);
|
|
375
|
+
waitInterval = Math.min(1, waitInterval * 2);
|
|
376
|
+
return;
|
|
377
|
+
}
|
|
378
|
+
store.enqueueReusableWatchClient(watchClient);
|
|
379
|
+
completion(true);
|
|
380
|
+
});
|
|
381
|
+
}catch (e){
|
|
382
|
+
logger.error("Error thrown calling redis multi/set/exec: %{error}", e);
|
|
383
|
+
watchClient.quit();
|
|
384
|
+
completion(false);
|
|
385
|
+
}
|
|
386
|
+
});
|
|
387
|
+
}catch (e){
|
|
388
|
+
logger.error("Error thrown calling change function: %{error}", e);
|
|
389
|
+
watchClient.quit();
|
|
390
|
+
completion(false);
|
|
391
|
+
}
|
|
392
|
+
});
|
|
393
|
+
}catch (e){
|
|
394
|
+
logger.error("Error thrown calling redis ttl: %{error}", error);
|
|
395
|
+
watchClient.quit();
|
|
396
|
+
completion(false);
|
|
397
|
+
}
|
|
398
|
+
});
|
|
399
|
+
}catch (e){
|
|
400
|
+
logger.error("Error thrown calling redis get: %{error}", error);
|
|
401
|
+
watchClient.quit();
|
|
402
|
+
completion(false);
|
|
403
|
+
}
|
|
404
|
+
});
|
|
405
|
+
}catch (e){
|
|
406
|
+
logger.error("Error thrown calling redis watch: %{error}", e);
|
|
407
|
+
watchClient.quit();
|
|
408
|
+
completion(false);
|
|
409
|
+
}
|
|
410
|
+
};
|
|
411
|
+
trySave();
|
|
412
|
+
}, this);
|
|
394
413
|
},
|
|
395
414
|
|
|
396
415
|
saveChange: function(change, completion){
|
|
@@ -35,7 +35,7 @@ JSClass("SKJobQueue", JSObject, {
|
|
|
35
35
|
return SKFileJobQueue.initWithURL(url, fileManager);
|
|
36
36
|
}else if (url.scheme === "redis"){
|
|
37
37
|
return SKRedisJobQueue.initWithURL(url, service);
|
|
38
|
-
}else if (url.scheme === "amqp"){
|
|
38
|
+
}else if (url.scheme === "amqp" || url.scheme === "amqps"){
|
|
39
39
|
return SKAMQPJobQueue.initWithURL(url, service);
|
|
40
40
|
}else if (url.scheme === "memory"){
|
|
41
41
|
return SKMemoryJobQueue.init();
|
|
@@ -46,7 +46,7 @@ JSClass("SKRedisJobQueue", SKJobQueue, {
|
|
|
46
46
|
if (this.openPromise === null){
|
|
47
47
|
this.openPromise = new Promise(function(resolve, reject){
|
|
48
48
|
logger.info("Redis client connecting to %{public}:%d...", queue.url.host, queue.url.port || 6379);
|
|
49
|
-
var client = queue.redis.createClient({url: queue.url.encodedString});
|
|
49
|
+
var client = queue.redis.createClient({url: queue.url.encodedString, legacyMode: true});
|
|
50
50
|
var errorHandler = function(error){
|
|
51
51
|
logger.info("Failed to open Redis connection: %{error}", error);
|
|
52
52
|
queue.openPromise = null;
|
|
@@ -61,8 +61,12 @@ JSClass("SKRedisJobQueue", SKJobQueue, {
|
|
|
61
61
|
queue.client = client;
|
|
62
62
|
resolve();
|
|
63
63
|
};
|
|
64
|
-
client.
|
|
65
|
-
|
|
64
|
+
if (client.connect){
|
|
65
|
+
client.connect().then(readyHandler, errorHandler);
|
|
66
|
+
}else{
|
|
67
|
+
client.on("error", errorHandler);
|
|
68
|
+
client.on("ready", readyHandler);
|
|
69
|
+
}
|
|
66
70
|
});
|
|
67
71
|
}
|
|
68
72
|
return this.openPromise;
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
FROM node:lts-alpine
|
|
2
2
|
|
|
3
|
-
COPY ${PROJECT_NAME_FILE_SAFE}
|
|
3
|
+
COPY ${PROJECT_NAME_FILE_SAFE} /${PROJECT_NAME_FILE_SAFE}
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
RUN cd /${PROJECT_NAME_FILE_SAFE} && npm install
|
|
6
|
+
|
|
7
|
+
ENTRYPOINT ["/${PROJECT_NAME_FILE_SAFE}/Node/${PROJECT_NAME_FILE_SAFE}"]
|